Sync from upstream

Wed Jan 21 09:33:13 2004  Jonathan Blandford  <jrb@gnome.org>

        * libgnomevfs/xdgmimeglob.c:
        * libgnomevfs/xdgmimemagic.c: Sync from upstream

diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog
index 58f5c6ead45ca9f6c59a0daa33d3bae1ec2913d6..d307a2d9ec7ee8475012f7b61cdfb5377511940e 100644 (file)
--- a/gtk/xdgmime/ChangeLog
+++ b/gtk/xdgmime/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 21 09:33:13 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * libgnomevfs/xdgmimeglob.c:
+       * libgnomevfs/xdgmimemagic.c: Sync from upstream
+
 Tue Jan 20 13:07:04 2004  Jonathan Blandford  <jrb@gnome.org>
 
        * xdgmime.c: resync with upstream sources.

diff --git a/gtk/xdgmime/xdgmimeglob.c b/gtk/xdgmime/xdgmimeglob.c
index b8b4d706a4a03baf1271cf1602312c5a5c7b1a2b..d267f7fa80f4fba38d6eddd13a15c89f610fe888 100644 (file)
--- a/gtk/xdgmime/xdgmimeglob.c
+++ b/gtk/xdgmime/xdgmimeglob.c
@@ -153,7 +153,7 @@ _xdg_glob_hash_node_new (void)
   return glob_hash_node;
 }
 
-void
+static void
 _xdg_glob_hash_node_dump (XdgGlobHashNode *glob_hash_node,
                          int depth)
 {
@@ -341,12 +341,14 @@ _xdg_glob_hash_new (void)
 static void
 _xdg_glob_hash_free_nodes (XdgGlobHashNode *node)
 {
-
-  if (node->child)
-    _xdg_glob_hash_free_nodes (node->child);
-  if (node->next)
-    _xdg_glob_hash_free_nodes (node->next);
-  free (node);
+  if (node)
+    {
+      if (node->child)
+       _xdg_glob_hash_free_nodes (node->child);
+      if (node->next)
+       _xdg_glob_hash_free_nodes (node->next);
+      free (node);
+    }
 }
 
 void

diff --git a/gtk/xdgmime/xdgmimemagic.c b/gtk/xdgmime/xdgmimemagic.c
index da1f22b27d34baf8479837abf550697b8ceac791..fb506be76c3dcaca421b4181103cb5dd21187a37 100644 (file)
--- a/gtk/xdgmime/xdgmimemagic.c
+++ b/gtk/xdgmime/xdgmimemagic.c
@@ -111,7 +111,7 @@ _xdg_mime_magic_matchlet_new (void)
 }
 
 
-void
+static void
 _xdg_mime_magic_matchlet_free (XdgMimeMagicMatchlet *mime_magic_matchlet)
 {
   if (mime_magic_matchlet)
@@ -129,7 +129,7 @@ _xdg_mime_magic_matchlet_free (XdgMimeMagicMatchlet *mime_magic_matchlet)
 
 /* Frees mime_magic_match and the remainder of its list
  */
-void
+static void
 _xdg_mime_magic_match_free (XdgMimeMagicMatch *mime_magic_match)
 {
   XdgMimeMagicMatch *ptr, *next;
@@ -614,7 +614,7 @@ _xdg_mime_magic_insert_match (XdgMimeMagic      *mime_magic,
   list = mime_magic->match_list;
   while (list->next != NULL)
     {
-      if (list->next->priority > match->priority)
+      if (list->next->priority < match->priority)
        {
          match->next = list->next;
          list->next = match;